Quiet down live migrate on PAE domains.

Signed-off-by: Steven Hand <steven@xensource.com>

diff --git a/xen/arch/x86/audit.c b/xen/arch/x86/audit.c
index f63c7905aa9271eaf41d8865293438fa0c262d03..16fda1ef6ff6d4a753503b515351454fc575ceee 100644 (file)
--- a/xen/arch/x86/audit.c
+++ b/xen/arch/x86/audit.c
@@ -472,13 +472,6 @@ int audit_adjust_pgtables(struct domain *d, int dir, int noisy)
                             errors++;
                         }
 
-                        if ( (page->u.inuse.type_info & PGT_pinned) != PGT_pinned )
-                        {
-                            printk("Audit %d: L2 mfn=%lx not pinned t=%"
-                                  PRtype_info "\n",
-                                   d->domain_id, mfn, page->u.inuse.type_info);
-                            errors++;
-                        }
                     }
                 }
 

diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
index d41303546869dcdf6c6bafd5149a8e7ba8870bd0..84ad6a1a94b430a0ef6cae383012704db0917df4 100644 (file)
--- a/xen/include/asm-x86/shadow.h
+++ b/xen/include/asm-x86/shadow.h
@@ -343,19 +343,15 @@ extern int shadow_status_noswap;
 #define SHADOW_REFLECTS_SNAPSHOT _PAGE_AVAIL0
 #endif
 
-#ifdef VERBOSE
+#if SHADOW_VERBOSE_DEBUG
 #define SH_LOG(_f, _a...)                                               \
     printk("DOM%uP%u: SH_LOG(%d): " _f "\n",                            \
        current->domain->domain_id , current->processor, __LINE__ , ## _a )
-#else
-#define SH_LOG(_f, _a...) ((void)0)
-#endif
-
-#if SHADOW_VERBOSE_DEBUG
 #define SH_VLOG(_f, _a...)                                              \
     printk("DOM%uP%u: SH_VLOG(%d): " _f "\n",                           \
            current->domain->domain_id, current->processor, __LINE__ , ## _a )
 #else
+#define SH_LOG(_f, _a...) ((void)0)
 #define SH_VLOG(_f, _a...) ((void)0)
 #endif